Update docker-compose to work with Apple Silicon #1572
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1572 +/- ##
==========================================
+ Coverage 89.20% 94.30% +5.09%
==========================================
Files 239 117 -122
Lines 10138 3479 -6659
Branches 1671 785 -886
==========================================
- Hits 9044 3281 -5763
+ Misses 958 194 -764
+ Partials 136 4 -132 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
ChristopherChudzicki
approved these changes
Nov 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pre-Flight checklist
What are the relevant tickets?
Closes #1568.
What's this PR do?
All of the
docker-composeoverrides were merged into the maindocker-composefile. This allows for an override file to be used specifically for anyone running OCW Studio locally on Apple Silicon.How should this be manually tested?
If running on an Intel machine, run
docker-compose upand verify that no functionality is impacted. If running on an Apple Silicon machine, runcp docker-compose-arm64.yml docker-compose.override.ymland thendocker-compose up. In particular, run any tests to ensure that Concourse runs as expected.